fast-float: use higher accuracy LUTs and rework some alpha handling

diff --git a/extensions/fast-float.c b/extensions/fast-float.c
index 9103bc93f020e0ee279298b1978eb72d0f2ab552..739364519f0689e024eefc4f73ab73f0e371cfc8 100644 (file)
--- a/extensions/fast-float.c
+++ b/extensions/fast-float.c
@@ -222,7 +222,7 @@ static BablLookup *fast_pow = NULL;
 
 static inline float core_lookup (float val, void *userdata)
 {
-  return linear_to_gamma_2_2 (val);
+  return babl_linear_to_gamma_2_2f (val);
 }
 
 static float
@@ -236,7 +236,7 @@ static BablLookup *fast_rpow = NULL;
 
 static inline float core_rlookup (float val, void *userdata)
 {
-  return gamma_2_2_to_linear (val);
+  return babl_gamma_2_2_to_linearf (val);
 }
 
 static float
@@ -265,10 +265,29 @@ conv_rgbaF_linear_rgbAF_gamma (unsigned char *src,
    while (n--)
      {
        float alpha = fsrc[3];
-       *fdst++ = linear_to_gamma_2_2_lut (*fsrc++) * alpha;
-       *fdst++ = linear_to_gamma_2_2_lut (*fsrc++) * alpha;
-       *fdst++ = linear_to_gamma_2_2_lut (*fsrc++) * alpha;
-       *fdst++ = *fsrc++;
+       if (alpha == 1.0)
+       {
+         *fdst++ = linear_to_gamma_2_2_lut (*fsrc++);
+         *fdst++ = linear_to_gamma_2_2_lut (*fsrc++);
+         *fdst++ = linear_to_gamma_2_2_lut (*fsrc++);
+         *fdst++ = *fsrc++;
+       }
+       else if (alpha == 0.0)
+       {
+         *fdst++ = 0.0;
+         *fdst++ = 0.0;
+         *fdst++ = 0.0;
+         *fdst++ = 0.0;
+         fsrc+=4;
+       }
+       else
+       {
+         *fdst++ = linear_to_gamma_2_2_lut (*fsrc++) * alpha;
+         *fdst++ = linear_to_gamma_2_2_lut (*fsrc++) * alpha;
+         *fdst++ = linear_to_gamma_2_2_lut (*fsrc++) * alpha;
+         *fdst++ = alpha;
+         fsrc++;
+       }
      }
   return samples;
 }
@@ -446,10 +465,10 @@ init (void)
     float f;
     float a;
 
-    fast_pow = babl_lookup_new (core_lookup, NULL, 0.0, 1.0,   0.0001);
-    fast_rpow = babl_lookup_new (core_rlookup, NULL, 0.0, 1.0, 0.0001);
+    fast_pow = babl_lookup_new (core_lookup, NULL, 0.0, 1.0,   0.00005);
+    fast_rpow = babl_lookup_new (core_rlookup, NULL, 0.0, 1.0, 0.00005);
 
-    for (f = 0.0; f < 1.0; f+= 0.000012)
+    for (f = 0.0; f < 1.0; f+= 0.0000001)
       {
         a = linear_to_gamma_2_2_lut (f);
         a = gamma_2_2_to_linear_lut (f);

diff --git a/extensions/float.c b/extensions/float.c
index 5cbbeb6517b75bd3f1581e0e8d7165c792ddeafa..9460804a2c3d948e6cf7f1307762b3422c9242d2 100644 (file)
--- a/extensions/float.c
+++ b/extensions/float.c
@@ -41,9 +41,9 @@ conv_rgbaF_linear_rgbAF_gamma (unsigned char *src,
    while (n--)
      {
        float alpha = fsrc[3];
-       *fdst++ = babl_linear_to_gamma_2_2 (*fsrc++) * alpha;
-       *fdst++ = babl_linear_to_gamma_2_2 (*fsrc++) * alpha;
-       *fdst++ = babl_linear_to_gamma_2_2 (*fsrc++) * alpha;
+       *fdst++ = babl_linear_to_gamma_2_2f (*fsrc++) * alpha;
+       *fdst++ = babl_linear_to_gamma_2_2f (*fsrc++) * alpha;
+       *fdst++ = babl_linear_to_gamma_2_2f (*fsrc++) * alpha;
        *fdst++ = *fsrc++;
      }
   return samples;
@@ -71,17 +71,17 @@ conv_rgbAF_linear_rgbAF_gamma (unsigned char *src,
          }
        else if (alpha >= 1.0)
          {
-           *fdst++ = babl_linear_to_gamma_2_2 (*fsrc++);
-           *fdst++ = babl_linear_to_gamma_2_2 (*fsrc++);
-           *fdst++ = babl_linear_to_gamma_2_2 (*fsrc++);
+           *fdst++ = babl_linear_to_gamma_2_2f (*fsrc++);
+           *fdst++ = babl_linear_to_gamma_2_2f (*fsrc++);
+           *fdst++ = babl_linear_to_gamma_2_2f (*fsrc++);
            *fdst++ = *fsrc++;
          }
        else
          {
            float alpha_recip = 1.0 / alpha;
-           *fdst++ = babl_linear_to_gamma_2_2 (*fsrc++ * alpha_recip) * alpha;
-           *fdst++ = babl_linear_to_gamma_2_2 (*fsrc++ * alpha_recip) * alpha;
-           *fdst++ = babl_linear_to_gamma_2_2 (*fsrc++ * alpha_recip) * alpha;
+           *fdst++ = babl_linear_to_gamma_2_2f (*fsrc++ * alpha_recip) * alpha;
+           *fdst++ = babl_linear_to_gamma_2_2f (*fsrc++ * alpha_recip) * alpha;
+           *fdst++ = babl_linear_to_gamma_2_2f (*fsrc++ * alpha_recip) * alpha;
            *fdst++ = *fsrc++;
          }
      }
@@ -99,9 +99,9 @@ conv_rgbaF_linear_rgbaF_gamma (unsigned char *src,
 
    while (n--)
      {
-       *fdst++ = babl_linear_to_gamma_2_2 (*fsrc++);
-       *fdst++ = babl_linear_to_gamma_2_2 (*fsrc++);
-       *fdst++ = babl_linear_to_gamma_2_2 (*fsrc++);
+       *fdst++ = babl_linear_to_gamma_2_2f (*fsrc++);
+       *fdst++ = babl_linear_to_gamma_2_2f (*fsrc++);
+       *fdst++ = babl_linear_to_gamma_2_2f (*fsrc++);
        *fdst++ = *fsrc++;
      }
   return samples;
@@ -118,9 +118,9 @@ conv_rgbF_linear_rgbF_gamma (unsigned char *src,
 
    while (n--)
      {
-       *fdst++ = babl_linear_to_gamma_2_2 (*fsrc++);
-       *fdst++ = babl_linear_to_gamma_2_2 (*fsrc++);
-       *fdst++ = babl_linear_to_gamma_2_2 (*fsrc++);
+       *fdst++ = babl_linear_to_gamma_2_2f (*fsrc++);
+       *fdst++ = babl_linear_to_gamma_2_2f (*fsrc++);
+       *fdst++ = babl_linear_to_gamma_2_2f (*fsrc++);
      }
   return samples;
 }
@@ -137,9 +137,9 @@ conv_rgbaF_gamma_rgbaF_linear (unsigned char *src,
 
    while (n--)
      {
-       *fdst++ = babl_gamma_2_2_to_linear (*fsrc++);
-       *fdst++ = babl_gamma_2_2_to_linear (*fsrc++);
-       *fdst++ = babl_gamma_2_2_to_linear (*fsrc++);
+       *fdst++ = babl_gamma_2_2_to_linearf (*fsrc++);
+       *fdst++ = babl_gamma_2_2_to_linearf (*fsrc++);
+       *fdst++ = babl_gamma_2_2_to_linearf (*fsrc++);
        *fdst++ = *fsrc++;
      }
   return samples;
@@ -156,9 +156,9 @@ conv_rgbF_gamma_rgbF_linear (unsigned char *src,
 
    while (n--)
      {
-       *fdst++ = babl_gamma_2_2_to_linear (*fsrc++);
-       *fdst++ = babl_gamma_2_2_to_linear (*fsrc++);
-       *fdst++ = babl_gamma_2_2_to_linear (*fsrc++);
+       *fdst++ = babl_gamma_2_2_to_linearf (*fsrc++);
+       *fdst++ = babl_gamma_2_2_to_linearf (*fsrc++);
+       *fdst++ = babl_gamma_2_2_to_linearf (*fsrc++);
      }
   return samples;
 }